Improve external drives detection

Use g_drive_is_removable for external drives detection. Current heuristic
fails in some cases (e.g. when removable drive is attached before login),
see Bug 765457.

Bump GLib version accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=765924

diff --git a/configure.ac b/configure.ac
index 8561c4e28b45b9dd3622a3dd4f2407bc7b2fe803..0a0b14fa3dc619f4556d07fd24b18425facb1c22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [45])
-m4_define([glib_required_micro], [8])
+m4_define([glib_required_minor], [49])
+m4_define([glib_required_micro], [1])
 m4_define([glib_required_version],
           [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 044439c5e6167093fd4588da82dde1b72da753bf..595fd3836d7d43b8532d44ca4a6470c6054bdb34 100644 (file)
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -877,9 +877,7 @@ is_external_volume (GVolume *volume)
   is_external |= !id;
 
   if (drive)
-    is_external |= g_drive_can_eject (drive) ||
-                   g_drive_is_media_removable (drive) ||
-                   g_drive_can_stop (drive);
+    is_external |= g_drive_is_removable (drive);
 
   g_clear_object (&drive);
   g_free (id);

diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 0bbf66931f8e10f7f9766a56813f725932edda26..de13d24488cfe4c9bba96ccdb4b3f821c7222a49 100644 (file)
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -475,9 +475,7 @@ is_external_volume (GVolume *volume)
   is_external |= !id;
 
   if (drive)
-    is_external |= g_drive_can_eject (drive) ||
-                   g_drive_is_media_removable (drive) ||
-                   g_drive_can_stop (drive);
+    is_external |= g_drive_is_removable (drive);
 
   g_clear_object (&drive);
   g_free (id);